From c80f1c9e6e90672e134aa6e1681cd2ea65f45c34 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Mon, 9 Nov 2020 19:11:30 +0100 Subject: [PATCH] Update patches --- debian/patches/100_javac-heap.patch | 16 -- debian/patches/101_java_install_path.patch | 19 -- .../patches/105_unforce_embedded_glew.patch | 16 -- ...stall_doxygen_scripts_in_nodoc_build.patch | 146 ---------- debian/patches/108_Doxygen-use-mathjax.patch | 28 -- ...0_matplotlib.patch => 10_matplotlib.patch} | 0 ...ch => 20_do_not_link_against_socket.patch} | 0 debian/patches/20_soversion-sharedlib.patch | 24 -- debian/patches/30_drop_medical_example.patch | 14 + debian/patches/40_vtkpython-9.patch | 35 +++ .../patches/50_fix_python-modules_path.patch | 30 ++ debian/patches/50_use_system_utf8.patch | 270 ------------------ debian/patches/60_fix_path_perl.patch | 52 ++++ .../patches/60_remove_mpi4py_dependency.patch | 16 -- debian/patches/70_fix_ftbfs_gcc49.patch | 106 ------- .../patches/70_fix_python_numpy_warning.patch | 15 + debian/patches/drop_medical_example.patch | 58 ---- debian/patches/fix_path_perl.patch | 95 ------ .../patches/fix_python_numpy_warnings.patch | 36 --- debian/patches/pyth | 84 ------ debian/patches/series | 23 +- debian/patches/vtk9python | 78 ----- 22 files changed, 153 insertions(+), 1008 deletions(-) delete mode 100644 debian/patches/100_javac-heap.patch delete mode 100644 debian/patches/101_java_install_path.patch delete mode 100644 debian/patches/105_unforce_embedded_glew.patch delete mode 100644 debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch delete mode 100644 debian/patches/108_Doxygen-use-mathjax.patch rename debian/patches/{30_matplotlib.patch => 10_matplotlib.patch} (100%) rename debian/patches/{110_do_not_link_against_socket.patch => 20_do_not_link_against_socket.patch} (100%) delete mode 100644 debian/patches/20_soversion-sharedlib.patch create mode 100644 debian/patches/30_drop_medical_example.patch create mode 100644 debian/patches/40_vtkpython-9.patch create mode 100644 debian/patches/50_fix_python-modules_path.patch delete mode 100644 debian/patches/50_use_system_utf8.patch create mode 100644 debian/patches/60_fix_path_perl.patch delete mode 100644 debian/patches/60_remove_mpi4py_dependency.patch delete mode 100644 debian/patches/70_fix_ftbfs_gcc49.patch create mode 100644 debian/patches/70_fix_python_numpy_warning.patch delete mode 100644 debian/patches/drop_medical_example.patch delete mode 100644 debian/patches/fix_path_perl.patch delete mode 100644 debian/patches/fix_python_numpy_warnings.patch delete mode 100644 debian/patches/pyth delete mode 100644 debian/patches/vtk9python diff --git a/debian/patches/100_javac-heap.patch b/debian/patches/100_javac-heap.patch deleted file mode 100644 index 1164c2f0d..000000000 --- a/debian/patches/100_javac-heap.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: set JVM max memory to 1024m. -Author: Matthias Klose -Acked-By: Anton Gladky -Last-Update: 2016-02-12 - ---- a/Wrapping/Java/CMakeLists.txt -+++ b/Wrapping/Java/CMakeLists.txt -@@ -96,6 +96,8 @@ - set(JAVAC_OPTIONS -J-Xmx512m) - endif() - -+set(JAVAC_OPTIONS -J-Xmx1024m) -+ - get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED) - foreach(module IN LISTS java_modules) - if(NOT ${module}_EXCLUDE_FROM_WRAPPING) diff --git a/debian/patches/101_java_install_path.patch b/debian/patches/101_java_install_path.patch deleted file mode 100644 index 52ba960a3..000000000 --- a/debian/patches/101_java_install_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Install Java modules in the correct path - This patch corrects the installation of the native Java modules - to go to the path given by the Debian Java Policy. This helps - to later use the simple install file to get them to the right - location in the package. -Author: Gert Wollny - ---- a/Rendering/OpenGL2/CMakeLists.txt -+++ b/Rendering/OpenGL2/CMakeLists.txt -@@ -311,7 +311,7 @@ - vtk_opengl_link(${vtk-module}) - if(VTK_USE_X) - vtk_module_link_libraries(${vtk-module} -- LINK_PUBLIC ${X11_LIBRARIES} ${X11_Xt_LIB}) -+ LINK_PUBLIC ${GLEW_LIBRARY} ${X11_LIBRARIES} ${X11_Xt_LIB}) - elseif(VTK_USE_COCOA) - vtk_module_link_libraries(${vtk-module} LINK_PUBLIC "-framework Cocoa") - endif() diff --git a/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch b/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch deleted file mode 100644 index 64dc8a0c0..000000000 --- a/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch +++ /dev/null @@ -1,146 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -118,9 +118,7 @@ - - # The doxygen documentation needs to be aware of all modules. - option(BUILD_DOCUMENTATION "Build the VTK documentation" OFF) --if(BUILD_DOCUMENTATION) -- add_subdirectory(Utilities/Doxygen) --endif() -+add_subdirectory(Utilities/Doxygen) - - # If python wrapping and testing is enabled then add driver scripts to run - # tests. Note: Many pythong tests used to be automatically converted from TCL ---- a/Utilities/Doxygen/CMakeLists.txt -+++ b/Utilities/Doxygen/CMakeLists.txt -@@ -1,69 +1,72 @@ - # - # Build the documentation - # --find_package(Doxygen REQUIRED) --find_package(Perl REQUIRED) --find_package(HTMLHelp) -- --option(DOXYGEN_SHORT_NAMES "Build Doxygen of VTK using short file names" OFF) --option(DOXYGEN_KEEP_TEMP "Do not delete the temporary Doxygen headers" OFF) --option(DOXYGEN_GENERATE_HTMLHELP "Generate HTML help (CHM) files" ON) --mark_as_advanced(DOXYGEN_SHORT_NAMES DOXYGEN_KEEP_TEMP DOXYGEN_GENERATE_HTMLHELP) --if(DOXYGEN_SHORT_NAMES) -- set(DOXYGEN_SHORT_NAMES YES) --else() -- set(DOXYGEN_SHORT_NAMES NO) --endif() --if(DOXYGEN_GENERATE_HTMLHELP) -- set(DOXYGEN_GENERATE_HTMLHELP YES) --else() -- set(DOXYGEN_GENERATE_HTMLHELP NO) --endif() -- --# --# Configure the script and the doxyfile, then add target --# --set(HAVE_DOT_YESNO NO) --if(DOT) -- set(HAVE_DOT_YESNO YES) -- if(NOT DOT_PATH) -- get_filename_component(DOT_PATH ${DOT} PATH) -+if (BUILD_DOCUMENTATION) -+ find_package(Doxygen REQUIRED) -+ find_package(Perl REQUIRED) -+ find_package(HTMLHelp) -+ -+ option(DOXYGEN_SHORT_NAMES "Build Doxygen of VTK using short file names" OFF) -+ option(DOXYGEN_KEEP_TEMP "Do not delete the temporary Doxygen headers" OFF) -+ option(DOXYGEN_GENERATE_HTMLHELP "Generate HTML help (CHM) files" ON) -+ mark_as_advanced(DOXYGEN_SHORT_NAMES DOXYGEN_KEEP_TEMP DOXYGEN_GENERATE_HTMLHELP) -+ if(DOXYGEN_SHORT_NAMES) -+ set(DOXYGEN_SHORT_NAMES YES) -+ else() -+ set(DOXYGEN_SHORT_NAMES NO) - endif() --endif() -- --# Build up a list of all module source directories. Note that this should be --# all source directories and so does not use the normal variables. --unset(VTK_MODULE_DIRS_DOXYGEN) --file(GLOB src RELATIVE "${VTK_SOURCE_DIR}" "${VTK_SOURCE_DIR}/*/*/module.cmake") --foreach(module ${src}) -- get_filename_component(module_BASE ${module} PATH) -- if("${module_BASE}" MATCHES "^Utilities" OR ${module_BASE} MATCHES "^Third") -- # Skip the utilities and third parties directories. -+ if(DOXYGEN_GENERATE_HTMLHELP) -+ set(DOXYGEN_GENERATE_HTMLHELP YES) - else() -- # Use both the source and binary directories, this ensures that -- # generated files will be included, but they may then be architecture, -- # build configuration and/or compiler specific. All source directories -- # are included whether the module is enabled or not. -- set(VTK_MODULE_DIRS_DOXYGEN -- "${VTK_MODULE_DIRS_DOXYGEN} -+ set(DOXYGEN_GENERATE_HTMLHELP NO) -+ endif() -+ -+ # -+ # Configure the script and the doxyfile, then add target -+ # -+ set(HAVE_DOT_YESNO NO) -+ if(DOT) -+ set(HAVE_DOT_YESNO YES) -+ if(NOT DOT_PATH) -+ get_filename_component(DOT_PATH ${DOT} PATH) -+ endif() -+ endif() -+ -+ # Build up a list of all module source directories. Note that this should be -+ # all source directories and so does not use the normal variables. -+ unset(VTK_MODULE_DIRS_DOXYGEN) -+ file(GLOB src RELATIVE "${VTK_SOURCE_DIR}" "${VTK_SOURCE_DIR}/*/*/module.cmake") -+ foreach(module ${src}) -+ get_filename_component(module_BASE ${module} PATH) -+ if("${module_BASE}" MATCHES "^Utilities" OR ${module_BASE} MATCHES "^Third") -+ # Skip the utilities and third parties directories. -+ else() -+ # Use both the source and binary directories, this ensures that -+ # generated files will be included, but they may then be architecture, -+ # build configuration and/or compiler specific. All source directories -+ # are included whether the module is enabled or not. -+ set(VTK_MODULE_DIRS_DOXYGEN -+ "${VTK_MODULE_DIRS_DOXYGEN} - \"${VTK_SOURCE_DIR}/${module_BASE}\" - \"${VTK_BINARY_DIR}/${module_BASE}\"") -- endif() --endforeach() -+ endif() -+ endforeach() -+ -+ configure_file( -+ ${VTK_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in -+ ${VTK_BINARY_DIR}/Utilities/Doxygen/doxyfile) -+ -+ configure_file( -+ ${VTK_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.cmake.in -+ ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -+ @ONLY) -+ -+ add_custom_target(DoxygenDoc -+ ${CMAKE_COMMAND} -+ -P ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -+ DEPENDS ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake) - --configure_file( -- ${VTK_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in -- ${VTK_BINARY_DIR}/Utilities/Doxygen/doxyfile) -- --configure_file( -- ${VTK_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.cmake.in -- ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -- @ONLY) -- --add_custom_target(DoxygenDoc -- ${CMAKE_COMMAND} -- -P ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -- DEPENDS ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake) -+endif() - - if(NOT VTK_INSTALL_NO_DOCUMENTATION) - macro(__vtk_install_documentation_files glob) diff --git a/debian/patches/108_Doxygen-use-mathjax.patch b/debian/patches/108_Doxygen-use-mathjax.patch deleted file mode 100644 index 236c423c6..000000000 --- a/debian/patches/108_Doxygen-use-mathjax.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Utilities/Doxygen/CMakeLists.txt -+++ b/Utilities/Doxygen/CMakeLists.txt -@@ -52,6 +52,13 @@ - endif() - endforeach() - -+ FIND_PATH(MATHJAX_CODEFILE MathJax.js -+ PATHS -+ /usr/share/mathjax/ -+ /usr/share/javascript/ -+ /usr/share/javascript/mathjax/ -+ ) -+ - configure_file( - ${VTK_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in - ${VTK_BINARY_DIR}/Utilities/Doxygen/doxyfile) ---- a/Utilities/Doxygen/doxyfile.in -+++ b/Utilities/Doxygen/doxyfile.in -@@ -19,6 +19,9 @@ - GENERATE_TAGFILE = "@VTK_BINARY_DIR@/Utilities/Doxygen/vtk@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@.tag" - - PDF_HYPERLINKS = YES -+USE_MATHJAX = YES -+MATHJAX_RELPATH = @MATHJAX_CODEFILE@ -+ - - HAVE_DOT = @HAVE_DOT_YESNO@ - DOT_PATH = "@DOT_PATH@" diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/10_matplotlib.patch similarity index 100% rename from debian/patches/30_matplotlib.patch rename to debian/patches/10_matplotlib.patch diff --git a/debian/patches/110_do_not_link_against_socket.patch b/debian/patches/20_do_not_link_against_socket.patch similarity index 100% rename from debian/patches/110_do_not_link_against_socket.patch rename to debian/patches/20_do_not_link_against_socket.patch diff --git a/debian/patches/20_soversion-sharedlib.patch b/debian/patches/20_soversion-sharedlib.patch deleted file mode 100644 index 3dbf1624c..000000000 --- a/debian/patches/20_soversion-sharedlib.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/CMake/vtkModuleMacros.cmake -+++ b/CMake/vtkModuleMacros.cmake -@@ -439,8 +439,8 @@ - function(vtk_target_name _name) - get_property(_type TARGET ${_name} PROPERTY TYPE) - if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL) -- set_property(TARGET ${_name} PROPERTY VERSION 1) -- set_property(TARGET ${_name} PROPERTY SOVERSION 1) -+ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}) -+ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) - endif() - if("${_name}" MATCHES "^[Vv][Tt][Kk]") - set(_vtk "") ---- a/Rendering/Tk/CMakeLists.txt -+++ b/Rendering/Tk/CMakeLists.txt -@@ -82,7 +82,7 @@ - vtk_target_install(vtkRenderingPythonTkWidgets) - - set_property(TARGET vtkRenderingPythonTkWidgets PROPERTY OUTPUT_NAME -- vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) -+ vtkRenderingPythonTkWidgets) - - set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES}) - if(VTK_USE_X) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch new file mode 100644 index 000000000..3b2a8871c --- /dev/null +++ b/debian/patches/30_drop_medical_example.patch @@ -0,0 +1,14 @@ +Description: Drop medical examples +Last-Update: 2020-10-21 + +--- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt ++++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt +@@ -55,7 +55,7 @@ else () + add_example(IO/Cxx) + add_example(ImageProcessing/Cxx) + add_example(Infovis/Cxx) +- add_example(Medical/Cxx) ++ #add_example(Medical/Cxx) + add_example(Modelling/Cxx) + add_example(MultiBlock/Cxx) + add_example(ParallelProcessing/Generic/Cxx) diff --git a/debian/patches/40_vtkpython-9.patch b/debian/patches/40_vtkpython-9.patch new file mode 100644 index 000000000..68a950c46 --- /dev/null +++ b/debian/patches/40_vtkpython-9.patch @@ -0,0 +1,35 @@ +Description: Rename vtkpython to vtkpython-9.0 +Author: Anton Gladky +Last-Update: 2020-11-05 + +Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt +=================================================================== +--- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt ++++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt +@@ -23,21 +23,21 @@ endif () + + # The interpreters are not supported in wheel builds, so skip them. + if (NOT VTK_WHEEL_BUILD) +- add_executable(vtkpython ++ add_executable(vtkpython-9.0 + vtkpython.rc + vtkPythonAppInit.cxx) +- target_link_libraries(vtkpython ++ target_link_libraries(vtkpython-9.0 + PRIVATE + VTK::WrappingPythonCore + VTK::PythonInterpreter + VTK::Python + VTK::vtkpythonmodules + VTK::vtksys) +- add_executable(VTK::vtkpython ALIAS vtkpython) ++ add_executable(VTK::vtkpython-9.0 ALIAS vtkpython-9.0) + if (VTK_INSTALL_PYTHON_EXES) + install( +- TARGETS vtkpython +- EXPORT VTKPython ++ TARGETS vtkpython-9.0 ++ EXPORT VTK9Python + DESTINATION "${CMAKE_INSTALL_BINDIR}") + endif () + diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch new file mode 100644 index 000000000..61e6fc98c --- /dev/null +++ b/debian/patches/50_fix_python-modules_path.patch @@ -0,0 +1,30 @@ +Description: Fix path for the installation of python modules +Author: Anton Gladky +Last-Update: 2020-11-06 + +Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake +=================================================================== +--- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake ++++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake +@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest + "for Python modules.") + set(_vtk_python_version_suffix) + endif () +- set(destination "${CMAKE_INSTALL_LIBDIR}/python${_vtk_python_version_suffix}/site-packages") ++ set(destination "lib/python3/dist-packages") + endif () + + set("${var}" "${destination}" PARENT_SCOPE) +Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt +=================================================================== +--- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt ++++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt +@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) + set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") + else () + set(VTK_PYTHON_SITE_PACKAGES_SUFFIX +- "python${vtk_python_version_pair}/site-packages") ++ "python3/dist-packages") + endif () + endif () + diff --git a/debian/patches/50_use_system_utf8.patch b/debian/patches/50_use_system_utf8.patch deleted file mode 100644 index addfc00e0..000000000 --- a/debian/patches/50_use_system_utf8.patch +++ /dev/null @@ -1,270 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk6 (6.2.0-1) unstable; urgency=medium - . - [ James Cowgill ] - * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802) -Author: Anton Gladky -Bug-Debian: https://bugs.debian.org/779802 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- a/Common/Core/module.cmake -+++ b/Common/Core/module.cmake -@@ -14,5 +14,4 @@ vtk_module(vtkCommonCore - vtkkwiml - PRIVATE_DEPENDS - vtksys -- vtkutf8 - ) -diff --git a/Common/Core/vtkUnicodeString.cxx b/Common/Core/vtkUnicodeString.cxx -index 8e50363d..d7681605 100644 ---- a/Common/Core/vtkUnicodeString.cxx -+++ b/Common/Core/vtkUnicodeString.cxx -@@ -22,7 +22,7 @@ - #include "vtkUnicodeString.h" - - #include "vtkObject.h" --#include -+#include - - #include - #include -@@ -39,7 +39,7 @@ vtkUnicodeString::const_iterator::const_iterator(std::string::const_iterator pos - - vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const - { -- return vtk_utf8::unchecked::peek_next(this->Position); -+ return utf8::unchecked::peek_next(this->Position); - } - - bool vtkUnicodeString::const_iterator::operator==(const const_iterator& rhs) const -@@ -54,27 +54,27 @@ bool vtkUnicodeString::const_iterator::operator!=(const const_iterator& rhs) con - - vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator++() - { -- vtk_utf8::unchecked::next(this->Position); -+ utf8::unchecked::next(this->Position); - return *this; - } - - vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator++(int) - { - const_iterator result(this->Position); -- vtk_utf8::unchecked::next(this->Position); -+ utf8::unchecked::next(this->Position); - return result; - } - - vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator--() - { -- vtk_utf8::unchecked::prior(this->Position); -+ utf8::unchecked::prior(this->Position); - return *this; - } - - vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator--(int) - { - const_iterator result(this->Position); -- vtk_utf8::unchecked::prior(this->Position); -+ utf8::unchecked::prior(this->Position); - return result; - } - -@@ -130,7 +130,7 @@ vtkUnicodeString::vtkUnicodeString(const vtkUnicodeString& rhs) : - vtkUnicodeString::vtkUnicodeString(size_type count, value_type character) - { - for(size_type i = 0; i != count; ++i) -- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage)); -+ utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage)); - } - - vtkUnicodeString::vtkUnicodeString(const_iterator first, const_iterator last) : -@@ -145,7 +145,7 @@ bool vtkUnicodeString::is_utf8(const char* value) - - bool vtkUnicodeString::is_utf8(const std::string& value) - { -- return vtk_utf8::is_valid(value.begin(), value.end()); -+ return utf8::is_valid(value.begin(), value.end()); - } - - vtkUnicodeString vtkUnicodeString::from_utf8(const char* value) -@@ -156,7 +156,7 @@ vtkUnicodeString vtkUnicodeString::from_utf8(const char* value) - vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end) - { - vtkUnicodeString result; -- if(vtk_utf8::is_valid(begin, end)) -+ if(utf8::is_valid(begin, end)) - { - result.Storage = std::string(begin, end); - } -@@ -170,7 +170,7 @@ vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end) - vtkUnicodeString vtkUnicodeString::from_utf8(const std::string& value) - { - vtkUnicodeString result; -- if(vtk_utf8::is_valid(value.begin(), value.end())) -+ if(utf8::is_valid(value.begin(), value.end())) - { - result.Storage = value; - } -@@ -193,9 +193,9 @@ vtkUnicodeString vtkUnicodeString::from_utf16(const vtkTypeUInt16* value) - - try - { -- vtk_utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage)); -+ utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage)); - } -- catch(vtk_utf8::invalid_utf16&) -+ catch(utf8::invalid_utf16&) - { - vtkGenericWarningMacro(<< "vtkUnicodeString::from_utf16(): not a valid UTF-16 string."); - } -@@ -229,15 +229,15 @@ vtkUnicodeString::value_type vtkUnicodeString::at(size_type offset) const - throw std::out_of_range("character out-of-range"); - - std::string::const_iterator iterator = this->Storage.begin(); -- vtk_utf8::unchecked::advance(iterator, offset); -- return vtk_utf8::unchecked::peek_next(iterator); -+ utf8::unchecked::advance(iterator, offset); -+ return utf8::unchecked::peek_next(iterator); - } - - vtkUnicodeString::value_type vtkUnicodeString::operator[](size_type offset) const - { - std::string::const_iterator iterator = this->Storage.begin(); -- vtk_utf8::unchecked::advance(iterator, offset); -- return vtk_utf8::unchecked::peek_next(iterator); -+ utf8::unchecked::advance(iterator, offset); -+ return utf8::unchecked::peek_next(iterator); - } - - const char* vtkUnicodeString::utf8_str() const -@@ -253,14 +253,14 @@ void vtkUnicodeString::utf8_str(std::string& result) const - std::vector vtkUnicodeString::utf16_str() const - { - std::vector result; -- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result)); -+ utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result)); - return result; - } - - void vtkUnicodeString::utf16_str(std::vector& result) const - { - result.clear(); -- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result)); -+ utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result)); - } - - vtkUnicodeString::size_type vtkUnicodeString::byte_count() const -@@ -270,7 +270,7 @@ vtkUnicodeString::size_type vtkUnicodeString::byte_count() const - - vtkUnicodeString::size_type vtkUnicodeString::character_count() const - { -- return vtk_utf8::unchecked::distance(this->Storage.begin(), this->Storage.end()); -+ return utf8::unchecked::distance(this->Storage.begin(), this->Storage.end()); - } - - bool vtkUnicodeString::empty() const -@@ -296,9 +296,9 @@ void vtkUnicodeString::push_back(value_type character) - { - try - { -- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage)); -+ utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage)); - } -- catch(vtk_utf8::invalid_code_point&) -+ catch(utf8::invalid_code_point&) - { - vtkGenericWarningMacro("vtkUnicodeString::push_back(): " << character << "is not a valid Unicode code point"); - } -@@ -315,7 +315,7 @@ void vtkUnicodeString::append(size_type count, value_type character) - { - this->Storage.append(vtkUnicodeString(count, character).Storage); - } -- catch(vtk_utf8::invalid_code_point&) -+ catch(utf8::invalid_code_point&) - { - vtkGenericWarningMacro("vtkUnicodeString::append(): " << character << "is not a valid Unicode code point"); - } -@@ -341,7 +341,7 @@ void vtkUnicodeString::assign(size_type count, value_type character) - { - this->Storage.assign(vtkUnicodeString(count, character).Storage); - } -- catch(vtk_utf8::invalid_code_point&) -+ catch(utf8::invalid_code_point&) - { - vtkGenericWarningMacro("vtkUnicodeString::assign(): " << character << "is not a valid Unicode code point"); - } -@@ -411,11 +411,11 @@ vtkUnicodeString vtkUnicodeString::substr(size_type offset, size_type count) con - std::string::const_iterator last = this->Storage.end(); - - while(from != last && offset--) -- vtk_utf8::unchecked::advance(from, 1); -+ utf8::unchecked::advance(from, 1); - - std::string::const_iterator to = from; - while(to != last && count--) -- vtk_utf8::unchecked::advance(to, 1); -+ utf8::unchecked::advance(to, 1); - - return vtkUnicodeString(from, to); - } -diff --git a/IO/Core/module.cmake b/IO/Core/module.cmake -index 24b54af0..d4907066 100644 ---- a/IO/Core/module.cmake -+++ b/IO/Core/module.cmake -@@ -14,7 +14,6 @@ vtk_module(vtkIOCore - vtklz4 - vtklzma - vtksys -- vtkutf8 - vtkzlib - vtkdoubleconversion - ) -diff --git a/IO/Core/vtkUTF8TextCodec.cxx b/IO/Core/vtkUTF8TextCodec.cxx -index c7f7985c..b0eeb9de 100644 ---- a/IO/Core/vtkUTF8TextCodec.cxx -+++ b/IO/Core/vtkUTF8TextCodec.cxx -@@ -23,7 +23,7 @@ PURPOSE. See the above copyright notice for more information. - #include "vtkObjectFactory.h" - #include "vtkTextCodecFactory.h" - --#include -+#include - - vtkStandardNewMacro(vtkUTF8TextCodec); - -@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8TextCodec::NextUnicode(istream& InputStream) - throw(std::string("End of Input")); - } - -- getSize = vtk_utf8::internal::sequence_length(c); -+ getSize = utf8::internal::sequence_length(c); - - if (0 == getSize) - throw(std::string("Not enough space")); -@@ -138,7 +138,7 @@ vtkUnicodeString::value_type vtkUTF8TextCodec::NextUnicode(istream& InputStream) - - istream::char_type* c1 = c; - -- const vtkTypeUInt32 code_point = vtk_utf8::next(c1, &c[getSize]); -+ const vtkTypeUInt32 code_point = utf8::next(c1, &c[getSize]); - - return code_point; - } diff --git a/debian/patches/60_fix_path_perl.patch b/debian/patches/60_fix_path_perl.patch new file mode 100644 index 000000000..cd69a5dbc --- /dev/null +++ b/debian/patches/60_fix_path_perl.patch @@ -0,0 +1,52 @@ +Description: Fix shebang for the perl scripts +Author: Anton Gladky +Last-Update: 2020-11-08 + +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2004-06-09 11:12:38 barre> + # + # Build cross-references between classes and examples +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-10-25 20:17:59 barre> + # + # Clean the HTML generated by Doxygen to remove some layout quicks +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-01-18 16:17:26 barre> + # + # Summary ? +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-11-21 17:40:48 barre> + # + # Build full-text index +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-10-05 11:49:40 barre> + # + # Remove path to intermediate Doxygen dir from html doc +--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl ++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2006-11-15 13:25:02 barre> + # + # Extract VTK version and add it to documentation diff --git a/debian/patches/60_remove_mpi4py_dependency.patch b/debian/patches/60_remove_mpi4py_dependency.patch deleted file mode 100644 index 91ceda2a0..000000000 --- a/debian/patches/60_remove_mpi4py_dependency.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: remove internal vtkmpi4py dependency -Author: Nico Schlömer -Last-Update: 2019-06-02 - -diff --git a/Parallel/MPI4Py/module.cmake b/Parallel/MPI4Py/module.cmake -index 07d789b2..26615b48 100644 ---- a/Parallel/MPI4Py/module.cmake -+++ b/Parallel/MPI4Py/module.cmake -@@ -5,7 +5,6 @@ if (VTK_WRAP_PYTHON) - DEPENDS - vtkParallelMPI - COMPILE_DEPENDS -- vtkmpi4py - vtkPython - OPTIONAL_PYTHON_LINK - EXCLUDE_FROM_JAVA_WRAPPING diff --git a/debian/patches/70_fix_ftbfs_gcc49.patch b/debian/patches/70_fix_ftbfs_gcc49.patch deleted file mode 100644 index 37c54febe..000000000 --- a/debian/patches/70_fix_ftbfs_gcc49.patch +++ /dev/null @@ -1,106 +0,0 @@ -Description: fix compilation with gcc-4.9 -Author: Anton Gladky -Bug-Debian: http://bugs.debian.org/746923 -Forwarded: https://github.com/Kitware/VTK/pull/7 -Last-Update: 2014-05-30 - ---- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -@@ -1206,7 +1206,10 @@ - vtkIdType cellsPerNode = numTotalCells / nprocs; - - vtkIdList **sendCells = new vtkIdList * [ nprocs ]; -- memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ -+ if (sizeof(vtkIdList *) * nprocs > 0) { -+ memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ } - - if (numConsumers == nprocs - 1) - { -@@ -1700,7 +1703,9 @@ - // Exchange int arrays - - float **recvArrays = new float * [nprocs]; -- memset(recvArrays, 0, sizeof(float *) * nprocs); -+ if (sizeof(float *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(float *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -1822,7 +1827,9 @@ - // Exchange int arrays - - vtkIdType **recvArrays = new vtkIdType * [nprocs]; -- memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ if (sizeof(vtkIdType *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -3167,7 +3174,9 @@ - vtkIdType nGridPoints = grid->GetNumberOfPoints(); - - vtkIdType *numPointsOutside = new vtkIdType [nprocs]; -- memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ if (sizeof(vtkIdType) * nprocs > 0) { -+ memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ } - - vtkIdTypeArray *globalIds = vtkIdTypeArray::New(); - globalIds->SetNumberOfValues(nGridPoints); -@@ -3249,10 +3258,16 @@ - // global ID back? - - vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs]; -- memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ -+ if (sizeof(vtkFloatArray *) * nprocs > 0) { -+ memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ } - - vtkIdTypeArray **localIds = new vtkIdTypeArray * [nprocs]; -- memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - vtkIdType *next = new vtkIdType [nprocs]; - vtkIdType *next3 = new vtkIdType [nprocs]; -@@ -3430,7 +3445,9 @@ - { - // There are no cells in my assigned region - -- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - return gids; - } -@@ -3641,7 +3658,10 @@ - std::multimap::iterator mapIt; - - vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs]; -- memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof (vtkIdTypeArray *) * nprocs > 0) { -+ memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ } - - for (int i=0; iGetNumberOfPoints(); - - vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs]; -- memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs) { -+ memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - if (numPoints < 1) - { diff --git a/debian/patches/70_fix_python_numpy_warning.patch b/debian/patches/70_fix_python_numpy_warning.patch new file mode 100644 index 000000000..2473932f3 --- /dev/null +++ b/debian/patches/70_fix_python_numpy_warning.patch @@ -0,0 +1,15 @@ +Description: Fix python numpy warning +Author: Anton Gladky +Last-Update: 2020-11-09 + +--- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py ++++ vtk9-9.0.1+dfsg1/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py +@@ -206,7 +206,7 @@ def _global_func(impl, array, axis, cont + return dsa.NoneArray; + + if res is dsa.NoneArray: +- if max_dims is 1: ++ if max_dims == 1: + # Weird trick to make the array look like a scalar + max_dims = () + res = numpy.empty(max_dims) diff --git a/debian/patches/drop_medical_example.patch b/debian/patches/drop_medical_example.patch deleted file mode 100644 index f3a54325e..000000000 --- a/debian/patches/drop_medical_example.patch +++ /dev/null @@ -1,58 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium - . - [ Gert Wollny ] - * Initial release. (Closes: #XXXXXX) - . - [ Drew Parsons ] - * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work - and python3 packaging. - * Drop deprecated patches: - 10_allpatches.patch - 40_use_system_sqlite.patch - - VTK_USE_SYSTEM_SQLITE now available - 60_use_system_mpi4py.patch - - handled by VTK_USE_SYSTEM_MPI4PY - 80_fix_arm_compilation.patch - - Qt5 now builds on arm - 107_gl2ps_1.4.0.patch - 109_use_parallel_hdf5.patch - 111_search_multiarch_paths_for_libproj.patch - . - [ Nico Schlömer ] - * Update to 8.2.0 - * remove obsolete patches, configure options - * rework utf-8 patch - * Update standard to 4.4.1 (no changes) -Author: Johannes Schauer - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-10-21 - ---- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt -@@ -55,7 +55,7 @@ else () - add_example(IO/Cxx) - add_example(ImageProcessing/Cxx) - add_example(Infovis/Cxx) -- add_example(Medical/Cxx) -+ #add_example(Medical/Cxx) - add_example(Modelling/Cxx) - add_example(MultiBlock/Cxx) - add_example(ParallelProcessing/Generic/Cxx) diff --git a/debian/patches/fix_path_perl.patch b/debian/patches/fix_path_perl.patch deleted file mode 100644 index 9759d5496..000000000 --- a/debian/patches/fix_path_perl.patch +++ /dev/null @@ -1,95 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium - . - [ Gert Wollny ] - * Initial release. (Closes: #XXXXXX) - . - [ Drew Parsons ] - * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work - and python3 packaging. - * Drop deprecated patches: - 10_allpatches.patch - 40_use_system_sqlite.patch - - VTK_USE_SYSTEM_SQLITE now available - 60_use_system_mpi4py.patch - - handled by VTK_USE_SYSTEM_MPI4PY - 80_fix_arm_compilation.patch - - Qt5 now builds on arm - 107_gl2ps_1.4.0.patch - 109_use_parallel_hdf5.patch - 111_search_multiarch_paths_for_libproj.patch - . - [ Nico Schlömer ] - * Update to 8.2.0 - * remove obsolete patches, configure options - * rework utf-8 patch - * Update standard to 4.4.1 (no changes) -Author: Johannes Schauer - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-11-08 - ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2004-06-09 11:12:38 barre> - # - # Build cross-references between classes and examples ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2002-10-25 20:17:59 barre> - # - # Clean the HTML generated by Doxygen to remove some layout quicks ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2002-01-18 16:17:26 barre> - # - # Summary ? ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2001-11-21 17:40:48 barre> - # - # Build full-text index ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2001-10-05 11:49:40 barre> - # - # Remove path to intermediate Doxygen dir from html doc ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2006-11-15 13:25:02 barre> - # - # Extract VTK version and add it to documentation diff --git a/debian/patches/fix_python_numpy_warnings.patch b/debian/patches/fix_python_numpy_warnings.patch deleted file mode 100644 index a9aed8c82..000000000 --- a/debian/patches/fix_python_numpy_warnings.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk9 (9.0.1+dfsg1-1~exp1) experimental; urgency=medium - . - * Initial release. (Closes: #XXXXXX) -Author: Anton Gladky - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-11-09 - ---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py -+++ vtk9-9.0.1+dfsg1/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py -@@ -206,7 +206,7 @@ def _global_func(impl, array, axis, cont - return dsa.NoneArray; - - if res is dsa.NoneArray: -- if max_dims is 1: -+ if max_dims == 1: - # Weird trick to make the array look like a scalar - max_dims = () - res = numpy.empty(max_dims) diff --git a/debian/patches/pyth b/debian/patches/pyth deleted file mode 100644 index 289e829ad..000000000 --- a/debian/patches/pyth +++ /dev/null @@ -1,84 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium - . - [ Gert Wollny ] - * Initial release. (Closes: #XXXXXX) - . - [ Drew Parsons ] - * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work - and python3 packaging. - * Drop deprecated patches: - 10_allpatches.patch - 40_use_system_sqlite.patch - - VTK_USE_SYSTEM_SQLITE now available - 60_use_system_mpi4py.patch - - handled by VTK_USE_SYSTEM_MPI4PY - 80_fix_arm_compilation.patch - - Qt5 now builds on arm - 107_gl2ps_1.4.0.patch - 109_use_parallel_hdf5.patch - 111_search_multiarch_paths_for_libproj.patch - . - [ Nico Schlömer ] - * Update to 8.2.0 - * remove obsolete patches, configure options - * rework utf-8 patch - * Update standard to 4.4.1 (no changes) -Author: Johannes Schauer - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-11-06 - -Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake -+++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake -@@ -33,8 +33,8 @@ vtk_module_python_default_destination(]) - ~~~ - --By default, the destination is `${CMAKE_INSTALL_BINDIR}/Lib/site-packages` on --Windows and `${CMAKE_INSTALL_LIBDIR}/python/site-packages` otherwise. -+By default, the destination is `${CMAKE_INSTALL_BINDIR}/Lib/dist-packages` on -+Windows and `${CMAKE_INSTALL_LIBDIR}/python/dist-packages` otherwise. - - `` must be one of `2` or `3`. If not specified, it defaults to - the value of `${VTK_PYTHON_VERSION}`. -@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest - "for Python modules.") - set(_vtk_python_version_suffix) - endif () -- set(destination "${CMAKE_INSTALL_LIBDIR}/python${_vtk_python_version_suffix}/site-packages") -+ set(destination "lib/python3/dist-packages") - endif () - - set("${var}" "${destination}" PARENT_SCOPE) -Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt -@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) - set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") - else () - set(VTK_PYTHON_SITE_PACKAGES_SUFFIX -- "python${vtk_python_version_pair}/site-packages") -+ "python3/dist-packages") - endif () - endif () - diff --git a/debian/patches/series b/debian/patches/series index c46259785..5f724768d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,16 +1,7 @@ -#20_soversion-sharedlib.patch -30_matplotlib.patch -#50_use_system_utf8.patch -#60_remove_mpi4py_dependency.patch -#70_fix_ftbfs_gcc49.patch -#100_javac-heap.patch -#101_java_install_path.patch -#105_unforce_embedded_glew.patch -#106_install_doxygen_scripts_in_nodoc_build.patch -#108_Doxygen-use-mathjax.patch -110_do_not_link_against_socket.patch -drop_medical_example.patch -vtk9python -pyth -fix_path_perl.patch -fix_python_numpy_warnings.patch +10_matplotlib.patch +20_do_not_link_against_socket.patch +30_drop_medical_example.patch +40_vtkpython-9.patch +50_fix_python-modules_path.patch +60_fix_path_perl.patch +70_fix_python_numpy_warning.patch diff --git a/debian/patches/vtk9python b/debian/patches/vtk9python deleted file mode 100644 index ad8566a49..000000000 --- a/debian/patches/vtk9python +++ /dev/null @@ -1,78 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium - . - [ Gert Wollny ] - * Initial release. (Closes: #XXXXXX) - . - [ Drew Parsons ] - * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work - and python3 packaging. - * Drop deprecated patches: - 10_allpatches.patch - 40_use_system_sqlite.patch - - VTK_USE_SYSTEM_SQLITE now available - 60_use_system_mpi4py.patch - - handled by VTK_USE_SYSTEM_MPI4PY - 80_fix_arm_compilation.patch - - Qt5 now builds on arm - 107_gl2ps_1.4.0.patch - 109_use_parallel_hdf5.patch - 111_search_multiarch_paths_for_libproj.patch - . - [ Nico Schlömer ] - * Update to 8.2.0 - * remove obsolete patches, configure options - * rework utf-8 patch - * Update standard to 4.4.1 (no changes) -Author: Johannes Schauer - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-11-05 - -Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt -@@ -23,21 +23,21 @@ endif () - - # The interpreters are not supported in wheel builds, so skip them. - if (NOT VTK_WHEEL_BUILD) -- add_executable(vtkpython -+ add_executable(vtkpython-9.0 - vtkpython.rc - vtkPythonAppInit.cxx) -- target_link_libraries(vtkpython -+ target_link_libraries(vtkpython-9.0 - PRIVATE - VTK::WrappingPythonCore - VTK::PythonInterpreter - VTK::Python - VTK::vtkpythonmodules - VTK::vtksys) -- add_executable(VTK::vtkpython ALIAS vtkpython) -+ add_executable(VTK::vtkpython-9.0 ALIAS vtkpython-9.0) - if (VTK_INSTALL_PYTHON_EXES) - install( -- TARGETS vtkpython -- EXPORT VTKPython -+ TARGETS vtkpython-9.0 -+ EXPORT VTK9Python - DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif () - -- 2.30.2